Merge patch fixing tty-related preprocessor inclusion error.

diff --cc debian/.git-dpm
index 9e8428653eba82d2a6fec53e8edc464aca8d9ad0,0000000000000000000000000000000000000000..1cf47d047096c3b6fb3e680ef8d57b4b154ab846
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- c58e9cd9eb3d4b49b97548cd9986743bcc9a9370
- c58e9cd9eb3d4b49b97548cd9986743bcc9a9370
 +# see git-dpm(1) from git-dpm package
++cba6a1f885d1e357fa92d36312dbc760b507082f
++cba6a1f885d1e357fa92d36312dbc760b507082f
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +emacs23_23.3+1.orig.tar.bz2
 +80b3822579eddfc120641c5a181eb0b5c7a0667d
 +23065394

diff --cc debian/patches/0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..075a86a9ac2f673f95117e98aaf30979310b02d9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
@@@ -1,0 -1,0 +1,42 @@@
++From cba6a1f885d1e357fa92d36312dbc760b507082f Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Fri, 8 Apr 2011 22:50:51 -0500
++Subject: Fix a tty-related preprocessor inclusion error affecting GNU/Hurd systems.
++
++A problem with the preprocessor defines in src/term.c has been fixed.
++This problem would cause Emacs to fail on GNU/Hurd systems as follows:
++
++  $ emacs -nw
++  emacs: Not a tty device: /dev/tty
++
++Author: Samuel Thibault <sthibault@debian.org>
++Date: Thu, 20 Jan 2011 02:17:24 +0100
++Applied-By: Rob Browning <rlb@defaultvalue.org>
++Forwarded: bug-gnu-emacs@gnu.org
++Closes: #610576
++---
++ src/term.c |    3 +--
++ 1 files changed, 1 insertions(+), 2 deletions(-)
++
++diff --git a/src/term.c b/src/term.c
++index 6d16a65..44e127e 100644
++--- a/src/term.c
+++++ b/src/term.c
++@@ -3413,13 +3413,12 @@ init_tty (char *name, char *terminal_type, int must_succeed)
++          if we don't have one at the moment.  */
++       fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0);
++     else
++-#else
+++#endif /* O_IGNORE_CTTY */
++       /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only
++          defined on Hurd.  On other systems, we need to explicitly
++          dissociate ourselves from the controlling tty when we want to
++          open a frame on the same terminal.  */
++       fd = emacs_open (name, O_RDWR | O_NOCTTY, 0);
++-#endif /* O_IGNORE_CTTY */
++ 
++     tty->name = xstrdup (name);
++     terminal->name = xstrdup (name);
++-- 
++1.7.4.1
++

diff --cc debian/patches/series
index d085702233ea5453084250399bd38f90314861f1,0000000000000000000000000000000000000000..96c36af9bc922faf3040b89f0b8032eb93582963
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
 +0006-Avoid-silently-losing-mail-via-fakemail.patch
 +0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
++0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch